From: Andreas Schwab Date: Sun, 5 Jun 2011 22:20:42 +0000 (+0200) Subject: * src/xfns.c (x_set_scroll_bar_default_width): Move declarations X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3541 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6f4429d957fd985551558fb9f6e31038cd429911;p=emacs.git * src/xfns.c (x_set_scroll_bar_default_width): Move declarations before statements. --- diff --git a/src/ChangeLog b/src/ChangeLog index 98558f1842b..2404b980f7e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-06-05 Andreas Schwab + + * xfns.c (x_set_scroll_bar_default_width): Move declarations + before statements. + 2011-06-05 Jan Djärv * gtkutil.c (xg_get_default_scrollbar_width): New function. diff --git a/src/xfns.c b/src/xfns.c index 2fd995df341..34ffdbffbfe 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1696,12 +1696,13 @@ x_set_scroll_bar_default_width (struct frame *f) { int wid = FRAME_COLUMN_WIDTH (f); int minw = 16; + int width; #ifdef USE_TOOLKIT_SCROLL_BARS #ifdef USE_GTK minw = xg_get_default_scrollbar_width (f); #endif /* A minimum width of 14 doesn't look good for toolkit scroll bars. */ - int width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM; + width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM; FRAME_CONFIG_SCROLL_BAR_COLS (f) = (width + wid - 1) / wid; FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = width; #else